Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update spack-stack-dev from spack develop as of 2024/10/31 #482

Merged

Conversation

climbfuji
Copy link
Collaborator

@climbfuji climbfuji commented Nov 1, 2024

Description

Update spack-stack-dev from spack develop as of 2024/10/31. The following files had merge conflicts that I needed to resolve and that I would like the reviewers to look at (there were a few more, but those I knew enough about to resolve with confidence):

        both modified:   .github/workflows/unit_tests.yaml
        both modified:   var/spack/repos/builtin/packages/fontconfig/package.py
        both modified:   var/spack/repos/builtin/packages/g2/package.py
        both modified:   var/spack/repos/builtin/packages/gdal/package.py
        both modified:   var/spack/repos/builtin/packages/gmake/package.py
        both modified:   var/spack/repos/builtin/packages/harfbuzz/package.py
        both modified:   var/spack/repos/builtin/packages/jasper/package.py
        both modified:   var/spack/repos/builtin/packages/landsfcutil/package.py
        both modified:   var/spack/repos/builtin/packages/libtirpc/package.py
        both modified:   var/spack/repos/builtin/packages/libxkbcommon/package.py
        both modified:   var/spack/repos/builtin/packages/openmpi/package.py
        both modified:   var/spack/repos/builtin/packages/pixman/package.py
        both modified:   var/spack/repos/builtin/packages/py-cffi/package.py
        both modified:   var/spack/repos/builtin/packages/py-metpy/package.py
        both modified:   var/spack/repos/builtin/packages/py-setuptools-rust/package.py
        both modified:   var/spack/repos/builtin/packages/qt/package.py
        both modified:   var/spack/repos/builtin/packages/sfcio/package.py
        both modified:   var/spack/repos/builtin/packages/sigio/package.py
        both modified:   var/spack/repos/builtin/packages/ufs-weather-model/package.py

Update 2024/11/08 Added commit a3dd052 to fix a bug in cprnc - the install rpaths for the netCDF libraries were missing, which caused the installations from the binary cache to fail during the relocation step:

$ ldd install/bin/cprnc
        linux-vdso.so.1 (0x00007ffde9de5000)
        libnetcdff.so.7 => not found
        libnetcdf.so.19 => not found
        libgfortran.so.5 => /home/dom/work/spack-stack/update_from_spack_dev_20241031/spack-stack-update/envs/ue-gcc-13.3.0/install/gcc/13.3.0/gcc-runtime-13.3.0-3gtnokv/lib/libgfortran.so.5 (0x0000152b8aa7d000)
        libm.so.6 => /lib64/libm.so.6 (0x0000152b8a9a2000)
        libgcc_s.so.1 => /home/dom/work/spack-stack/update_from_spack_dev_20241031/spack-stack-update/envs/ue-gcc-13.3.0/install/gcc/13.3.0/gcc-runtime-13.3.0-3gtnokv/lib/libgcc_s.so.1 (0x0000152b8a97c000)
        libc.so.6 => /lib64/libc.so.6 (0x0000152b8a773000)
        /lib64/ld-linux-x86-64.so.2 (0x0000152b8ad63000)

Testing

wdconinc and others added 30 commits October 16, 2024 18:44
Co-authored-by: Gava, Francesco <[email protected]>
Co-authored-by: Bernhard Kaindl <[email protected]>
* e4s external rocm ci: upgrade to v6.2.1

* use ghcr.io/spack/spack/ubuntu22.04-runner-amd64-gcc-11.4-rocm6.2.1:2024.10.08

* magma +rocm: add entry for v6.2.1
* Updates Caliper recipe to build the new Python bindings

* Implements setup_run_environment for Caliper to update PYTHONPATH
* e4s ci stacks: add fftx cpu, cuda, and rocm builds

* disable fftx+rocm due to spack github issue spack#47034

* e4s oneapi: fftx has spack build error spack#47048
* voropp: migrate to cmake

* lammps: update voropp dep
* Remove the implicit CORE-AVX512 since the CPU specific flags are added by the
compiler wrappers.
* Add `-i_use-path` to help `ifx` find `lld` even if `-gcc-name` is set in
`ifx.cfg`. This file is written by `intel-oneapi-compilers` package to find the
correct `gcc`. Not being able to find `ldd` is a bug in `ifx`. @rschon2 found
this workaround.
…#47065)

Turns out `os=...` of the spec and `MACOSX_DEPLOYMENT_TARGET` are kept
in sync, and the env variable is used to initialize
`CMAKE_MACOSX_DEPLOYMENT_TARGET`.

In bootstrap code we set the env variable, so these bits are redundant.

---------

Co-authored-by: haampie <[email protected]>
Some unused methods in VTK-m resulted in compile errors. These were
not discovered because many compilers ignore unused methods in templated
classes, but the SYCL compiler for Aurora gave an error.
* py-coca-pytorch: new package

* [py-coca-pytorch] black

---------

Co-authored-by: Alex C Leute <[email protected]>
…ge.py, var/spack/repos/builtin/packages/libxkbcommon/package.py, var/spack/repos/builtin/packages/openmpi/package.py
@climbfuji climbfuji changed the title WIP Feature/update from spack dev 20241031 Update spack-stack-dev from spack develop as of 2024/10/31 Nov 4, 2024
…and lib/spack/spack/compilers/oneapi.py: set correct version ranges
@climbfuji climbfuji marked this pull request as ready for review November 5, 2024 19:35
@AlexanderRichert-NOAA
Copy link
Collaborator

I'll need a bit of time to look over this. It looks good so far, though I think it'll need one or two tweaks related to static libraries...

Copy link
Collaborator

@srherbener srherbener left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested on my Mac (Sonoma 14.6.1, Command Line Tools 15.3, GNU Fortran 12.4.0), and it looks good. I was able to build jedi-bundle and I got the usual ctest failures (19) that we have been seeing on the mac.

@climbfuji
Copy link
Collaborator Author

@AlexanderRichert-NOAA Please make sure to push any changes here upstream afterwards. We want the packages to be 100% identical, if possible. I will create a PR for a3dd052 (cprnc) shortly.

@climbfuji
Copy link
Collaborator Author

spack PR for the cprnc bug fix: spack#47505

@AlexanderRichert-NOAA
Copy link
Collaborator

@climbfuji yep will do, I'm keeping a log, and I'll also provide a summary here when I'm done going through the list of conflicts.

@climbfuji
Copy link
Collaborator Author

climbfuji commented Nov 8, 2024 via email

@AlexanderRichert-NOAA
Copy link
Collaborator

AlexanderRichert-NOAA commented Nov 8, 2024

Here's my summary of the packages that were manually fixed for conflicts:
g2, gmake, harfbuzz, jasper, landsfcutil, openmpi, pixman, py-cffi, py-metpy, qt, sfcio, sigio, ufs-weather-model: good (in most cases no difference with main spack)
fontconfig: updated static deps logic
gdal: updated static deps logic for gdal, libgeotiff
libxkbcommon: updated static deps logic
py-setuptools-rust: removed duplicate py-typing-extensions dep

@@ -1,4 +1,4 @@
# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be reverted, or?

@climbfuji
Copy link
Collaborator Author

spack PR for the cprnc bug fix: spack#47505

The upstream PR for the cprnc bug fix was merged

@climbfuji climbfuji merged commit b6ef265 into JCSDA:spack-stack-dev Nov 13, 2024
8 checks passed
@climbfuji climbfuji deleted the feature/update_from_spack_dev_20241031 branch November 13, 2024 22:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.